Skip to content

Conversation

breskeby
Copy link
Contributor

@breskeby breskeby commented Sep 25, 2025

In #135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.

…fallback

In elastic#135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.
@breskeby breskeby requested a review from a team as a code owner September 25, 2025 06:22
@breskeby breskeby added >non-issue :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team auto-backport Automatically create backport pull requests when merged v9.2.0 v8.19.5 v9.1.5 v9.0.8 v8.18.9 labels Sep 25, 2025
@breskeby breskeby self-assigned this Sep 25, 2025
@breskeby breskeby added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Sep 25, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@breskeby breskeby changed the title [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback [CI] Handle BWC version correctly when overriding bundled jdk Sep 25, 2025
@breskeby breskeby changed the title [CI] Handle BWC version correctly when overriding bundled jdk [CI] Handle snapshot BWC version when patching bundled jdk Sep 25, 2025
@breskeby breskeby merged commit 6047a74 into elastic:main Sep 25, 2025
31 of 34 checks passed
@breskeby breskeby deleted the fix-handling-000-versions branch September 25, 2025 07:28
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.19 Commit could not be cherrypicked due to conflicts
9.1
9.0 Commit could not be cherrypicked due to conflicts
8.18 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 135399

breskeby added a commit to breskeby/elasticsearch that referenced this pull request Sep 25, 2025
…fallback (elastic#135399)

In elastic#135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Sep 25, 2025
…fallback (elastic#135399)

In elastic#135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.

(cherry picked from commit 6047a74)

# Conflicts:
#	test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Sep 25, 2025
…fallback (elastic#135399)

In elastic#135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.

(cherry picked from commit 6047a74)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Sep 25, 2025
…fallback (elastic#135399)

In elastic#135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.

(cherry picked from commit 6047a74)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java
#	test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java
@breskeby
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.0
8.19
8.18

Questions ?

Please refer to the Backport tool documentation

elasticsearchmachine pushed a commit that referenced this pull request Sep 25, 2025
…g jdk fallback (#135399) (#135404)

* [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399)

In #135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.

* fix typo
breskeby added a commit that referenced this pull request Sep 25, 2025
…g jdk fallback (#135399) (#135410)

* [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399)

In #135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.

(cherry picked from commit 6047a74)

# Conflicts:
#	test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java

* Fix typo
breskeby added a commit that referenced this pull request Sep 25, 2025
…ng jdk fallback (#135399) (#135411)

* [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399)

In #135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.

(cherry picked from commit 6047a74)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java

* Fix typo
breskeby added a commit that referenced this pull request Sep 25, 2025
…ng jdk fallback (#135399) (#135412)

* [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399)

In #135300 we introduced a fallback to
use adoptopenjdk17 when running bwc tests with older distributions.
This fix handles the calculation of overriding requirement by taken 0.0.0 version into account
which is used to represent versions representing git snapshots.

(cherry picked from commit 6047a74)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java
#	test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java

* [CI] Auto commit changes from spotless

* Fix typo

---------

Co-authored-by: elasticsearchmachine <[email protected]>
szybia added a commit to szybia/elasticsearch that referenced this pull request Sep 25, 2025
…-dls

* upstream/main: (100 commits)
  ES|QL: Add FUSE operator tests (elastic#135307)
  [D0CS] Revise connector setup steps in documentation (elastic#135426)
  Fix DiscoveryDisruptionIT.testElectMasterWithLatestVersion (elastic#135396)
  [DOCS] Marks the change point agg as GA (elastic#134898)
  Rework ShardSearchContextId to explain use of searcher id better (elastic#135233)
  [CI] Handle caching bwc dependencies more gracefully (elastic#135417)
  Mute org.elasticsearch.gradle.TestClustersPluginFuncTest override jdk usage via ES_JAVA_HOME for known jdk os incompatibilities elastic#135413
  [Build] update eclipse formatter used by spotless (elastic#135382)
  [Test] Fix typo in build tool tests (elastic#135405)
  Fixes testSnapshotShutdownProgressTracker (elastic#134926)
  Mute org.elasticsearch.upgrades.StandardToLogsDbIndexModeRollingUpgradeIT testLogsIndexing {upgradedNodes=1} elastic#135313
  OTLP: remove feature flag (elastic#135401)
  [Docs] Convert asciidoc lifecycle markers into Docs V3 syntax (elastic#135347)
  Mute org.elasticsearch.upgrades.QueryableBuiltInRolesUpgradeIT testBuiltInRolesSyncedOnClusterUpgrade elastic#135194
  Mute org.elasticsearch.upgrades.IndexingIT testIndexing elastic#135407
  Mute org.elasticsearch.upgrades.DataStreamsUpgradeIT testDataStreamValidationDoesNotBreakUpgrade elastic#135406
  [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (elastic#135399)
  [Build] Update checkstyle from 10.3 to 11.0.1 (elastic#135381)
  Mute org.elasticsearch.upgrades.TextRollingUpgradeIT testIndexing {upgradedNodes=2} elastic#135238
  Mute org.elasticsearch.upgrades.MatchOnlyTextRollingUpgradeIT testIndexing {upgradedNodes=2} elastic#135325
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport pending :Delivery/Build Build or test infrastructure >non-issue Team:Delivery Meta label for Delivery team v8.18.8 v8.19.5 v9.0.8 v9.1.5 v9.2.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants